From: Daniel De Graaf Date: Sat, 28 Jan 2012 13:48:34 +0000 (+0000) Subject: xen: change virq parameters from int to uint32_t X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success/%22http:/www.example.com/cgi/success?a=commitdiff_plain;h=4c4b722d452e99db6c42f356b8dd8f91f6a854da;p=xen.git xen: change virq parameters from int to uint32_t Signed-off-by: Daniel De Graaf Committed-by: Keir Fraser --- diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index 43bd16755e..f784254daf 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -104,11 +104,11 @@ static uint8_t get_xen_consumer(xen_event_channel_notification_t fn) static int evtchn_set_pending(struct vcpu *v, int port); -static int virq_is_global(int virq) +static int virq_is_global(uint32_t virq) { int rc; - ASSERT((virq >= 0) && (virq < NR_VIRQS)); + ASSERT(virq < NR_VIRQS); switch ( virq ) { @@ -665,12 +665,12 @@ static int evtchn_set_pending(struct vcpu *v, int port) return 0; } -int guest_enabled_event(struct vcpu *v, int virq) +int guest_enabled_event(struct vcpu *v, uint32_t virq) { return ((v != NULL) && (v->virq_to_evtchn[virq] != 0)); } -void send_guest_vcpu_virq(struct vcpu *v, int virq) +void send_guest_vcpu_virq(struct vcpu *v, uint32_t virq) { unsigned long flags; int port; @@ -689,7 +689,7 @@ void send_guest_vcpu_virq(struct vcpu *v, int virq) spin_unlock_irqrestore(&v->virq_lock, flags); } -static void send_guest_global_virq(struct domain *d, int virq) +static void send_guest_global_virq(struct domain *d, uint32_t virq) { unsigned long flags; int port; diff --git a/xen/include/asm-ia64/event.h b/xen/include/asm-ia64/event.h index c99babd97e..4463cb3286 100644 --- a/xen/include/asm-ia64/event.h +++ b/xen/include/asm-ia64/event.h @@ -63,7 +63,7 @@ static inline void local_event_delivery_enable(void) current->vcpu_info->evtchn_upcall_mask = 0; } -static inline int arch_virq_is_global(int virq) +static inline int arch_virq_is_global(uint32_t virq) { int rc; diff --git a/xen/include/asm-x86/event.h b/xen/include/asm-x86/event.h index 606ec6df06..06057c7bea 100644 --- a/xen/include/asm-x86/event.h +++ b/xen/include/asm-x86/event.h @@ -39,7 +39,7 @@ static inline void local_event_delivery_enable(void) } /* No arch specific virq definition now. Default to global. */ -static inline int arch_virq_is_global(int virq) +static inline int arch_virq_is_global(uint32_t virq) { return 1; } diff --git a/xen/include/xen/event.h b/xen/include/xen/event.h index 40b8a7a4c3..22fc6a3f3d 100644 --- a/xen/include/xen/event.h +++ b/xen/include/xen/event.h @@ -20,7 +20,7 @@ * @v: VCPU to which virtual IRQ should be sent * @virq: Virtual IRQ number (VIRQ_*) */ -void send_guest_vcpu_virq(struct vcpu *v, int virq); +void send_guest_vcpu_virq(struct vcpu *v, uint32_t virq); /* * send_global_virq: Notify the domain handling a global VIRQ. @@ -65,7 +65,7 @@ void free_xen_event_channel( struct vcpu *local_vcpu, int port); /* Query if event channel is in use by the guest */ -int guest_enabled_event(struct vcpu *v, int virq); +int guest_enabled_event(struct vcpu *v, uint32_t virq); /* Notify remote end of a Xen-attached event channel.*/ void notify_via_xen_event_channel(struct domain *ld, int lport);